-
Notifications
You must be signed in to change notification settings - Fork 443
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix: leave call from system message 'call_ended_everyone' #13977
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Antreesy
added
3. to review
bug
feature: frontend 🖌️
"Web UI" client
feature: call 📹
Voice and video calls
labels
Dec 10, 2024
nickvergessen
requested changes
Dec 11, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In a quick test, this only seems to work/make a difference with HPB and not for the moderator.
- User left side
- Moderator right side
Bildschirmaufzeichnung.vom.2024-12-11.07-34-08.webm
but I tested with 2 sleeps in the leave call controller method
Make join slow
diff --git a/lib/Controller/CallController.php b/lib/Controller/CallController.php
index 8128e4314..c292b655c 100644
--- a/lib/Controller/CallController.php
+++ b/lib/Controller/CallController.php
@@ -221,6 +221,8 @@ class CallController extends AEnvironmentAwareOCSController {
#[RequireParticipant]
#[RequireReadWriteConversation]
public function joinCall(?int $flags = null, bool $silent = false, bool $recordingConsent = false): DataResponse {
+ // SIMULATE OVERLOADED SERVER
+ sleep(5);
try {
$this->validateRecordingConsent($recordingConsent);
} catch (\InvalidArgumentException) {
@@ -248,6 +250,8 @@ class CallController extends AEnvironmentAwareOCSController {
$this->participantService->changeInCall($this->room, $this->participant, $flags, false, $silent);
}
+ // SIMULATE HUGE CALL
+ sleep(15);
return $response;
}
@@ -257,6 +261,9 @@ class CallController extends AEnvironmentAwareOCSController {
} catch (\InvalidArgumentException $e) {
return new DataResponse(['error' => $e->getMessage()], Http::STATUS_BAD_REQUEST);
}
+
+ // SIMULATE HUGE CALL
+ sleep(15);
return new DataResponse(null);
}
Make leave slow
diff --git a/lib/Controller/CallController.php b/lib/Controller/CallController.php
index 8128e4314..0be725cd4 100644
--- a/lib/Controller/CallController.php
+++ b/lib/Controller/CallController.php
@@ -493,6 +493,9 @@ class CallController extends AEnvironmentAwareOCSController {
#[PublicPage]
#[RequireParticipant]
public function leaveCall(bool $all = false): DataResponse {
+ // SIMULATE OVERLOADED SERVER
+ sleep(5);
+
$session = $this->participant->getSession();
if (!$session instanceof Session) {
return new DataResponse(null, Http::STATUS_NOT_FOUND);
@@ -507,6 +510,9 @@ class CallController extends AEnvironmentAwareOCSController {
$this->participantService->changeInCall($this->room, $this->participant, Participant::FLAG_DISCONNECTED);
}
+ // SIMULATE HUGE CALL
+ sleep(15);
+
return $response;
}
@@ -526,6 +532,9 @@ class CallController extends AEnvironmentAwareOCSController {
}
}
+ // SIMULATE HUGE CALL
+ sleep(15);
+
return new DataResponse(null);
}
Signed-off-by: Maksim Sukharev <[email protected]>
nickvergessen
force-pushed
the
fix/noid/swift-leave-call
branch
from
January 9, 2025 08:05
c4a63ff
to
3ad04b3
Compare
nickvergessen
approved these changes
Jan 9, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
☑️ Resolves
usersInCallChanged
) to leave by itselfHow to test:
🖌️ UI Checklist
🖼️ Screenshots / Screencasts
🏁 Checklist